Skip to content

try out merge queues #11015

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Jun 27, 2025
Merged

try out merge queues #11015

merged 1 commit into from
Jun 27, 2025
+9 −0

Conversation

geekosaur
Copy link
Collaborator

@geekosaur geekosaur commented Jun 24, 2025 •
edited
Loading

Also enabling parallel checks, which should speed things up even more especially since Mergify forced us to separate the normal and squash-merge queues.

Also adjust the labels set for the bot to try to avoid making noise when it's being shoved straight in.

Template B: This PR does not modify behaviour or interface

E.g. the PR only touches documentation or tests, does refactorings, etc.

Include the following checklist in your PR:

  • Patches conform to the coding conventions.
  • Is this a PR that fixes CI? If so, it will need to be backported to older cabal release branches (ask maintainers for directions). Mergify configuration is only read on master

ulysses4ever
ulysses4ever approved these changes Jun 24, 2025
View reviewed changes
Copy link
Collaborator

@ulysses4ever ulysses4ever left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If this works, that would be awesome! Only one way to find out...

@geekosaur geekosaur force-pushed the mergify-queue branch 2 times, most recently from a47ed3f to 32eb467 Compare June 24, 2025 21:46
@geekosaur
Copy link
Collaborator Author

geekosaur commented Jun 24, 2025 •
edited
Loading

BTW if this works then the next thing to try is to see if things we had to use merge+no rebase with work with merge me or squash+merge me. I think (per @TeofilC on Matrix) that Mergify cherry-picks commits into the queue PR, squashes them if it's the squash+merge queue, and rebases the result — which will be happening on Mergify's own local PR, not the one it's not allowed to rebase.

@ulysses4ever
Copy link
Collaborator

@geekosaur this sounds terrific, thank you for researching it! and thanks to @TeofilC for pitching in!

Mikolaj
Mikolaj approved these changes Jun 25, 2025
View reviewed changes
Copy link
Member

@Mikolaj Mikolaj left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yay!

@geekosaur geekosaur added merge me Tell Mergify Bot to merge and removed attention: needs-review labels Jun 25, 2025
@mergify mergify bot added ready and waiting Mergify is waiting out the cooldown period merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days labels Jun 25, 2025
@mergify Mergify
Copy link
Contributor

mergify bot commented Jun 27, 2025

This pull request has been removed from the queue for the following reason: pull request branch update failed.

The pull request can't be updated.

You should update or rebase your pull request manually. If you do, this pull request will automatically be requeued once the queue conditions match again.
If you think this was a flaky issue, you can requeue the pull request, without updating it, by posting a @mergifyio requeue comment.

@geekosaur
try out merge queues
22cac64 
also adjust the labels set for the bot to avoid making noise when
it's being shoved straight in
@geekosaur
Copy link
Collaborator Author

If we're lucky, this might even fix the above problem.

@ulysses4ever
Copy link
Collaborator

Yes. Fingers crossed...

@mergify mergify bot merged commit 1dd3729 into haskell:master Jun 27, 2025
55 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Mikolaj Mikolaj Mikolaj approved these changes

@ulysses4ever ulysses4ever ulysses4ever approved these changes

Assignees
No one assigned
Labels
merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days merge me Tell Mergify Bot to merge ready and waiting Mergify is waiting out the cooldown period
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@geekosaur @ulysses4ever @Mikolaj